Optimize a little bit. (More for consistency than because it makes much of

Fri Jan  4 01:36:48 2002  Owen Taylor  <otaylor@redhat.com>

	* gdk/x11/gdkdrawable-x11.c (convert_to_format): Optimize
	a little bit. (More for consistency than because it
	makes much of a difference.)

diff --git a/ChangeLog b/ChangeLog
index be56ec86c7d2610876596f874ffa192ef82c208d..15cf3d1d949a2675704112e60bd9130dad077147 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Jan  4 01:36:48 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkdrawable-x11.c (convert_to_format): Optimize
+       a little bit. (More for consistency than because it
+       makes much of a difference.)
+
 Thu Jan  3 22:18:15 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/gdkdrawable-x11.c gdk/x11/gdkprivate-x11.h

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index be56ec86c7d2610876596f874ffa192ef82c208d..15cf3d1d949a2675704112e60bd9130dad077147 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+Fri Jan  4 01:36:48 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkdrawable-x11.c (convert_to_format): Optimize
+       a little bit. (More for consistency than because it
+       makes much of a difference.)
+
 Thu Jan  3 22:18:15 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/gdkdrawable-x11.c gdk/x11/gdkprivate-x11.h

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index be56ec86c7d2610876596f874ffa192ef82c208d..15cf3d1d949a2675704112e60bd9130dad077147 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Fri Jan  4 01:36:48 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkdrawable-x11.c (convert_to_format): Optimize
+       a little bit. (More for consistency than because it
+       makes much of a difference.)
+
 Thu Jan  3 22:18:15 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/gdkdrawable-x11.c gdk/x11/gdkprivate-x11.h

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index be56ec86c7d2610876596f874ffa192ef82c208d..15cf3d1d949a2675704112e60bd9130dad077147 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Fri Jan  4 01:36:48 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkdrawable-x11.c (convert_to_format): Optimize
+       a little bit. (More for consistency than because it
+       makes much of a difference.)
+
 Thu Jan  3 22:18:15 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/gdkdrawable-x11.c gdk/x11/gdkprivate-x11.h

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index be56ec86c7d2610876596f874ffa192ef82c208d..15cf3d1d949a2675704112e60bd9130dad077147 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Fri Jan  4 01:36:48 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkdrawable-x11.c (convert_to_format): Optimize
+       a little bit. (More for consistency than because it
+       makes much of a difference.)
+
 Thu Jan  3 22:18:15 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/gdkdrawable-x11.c gdk/x11/gdkprivate-x11.h

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index be56ec86c7d2610876596f874ffa192ef82c208d..15cf3d1d949a2675704112e60bd9130dad077147 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Fri Jan  4 01:36:48 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkdrawable-x11.c (convert_to_format): Optimize
+       a little bit. (More for consistency than because it
+       makes much of a difference.)
+
 Thu Jan  3 22:18:15 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/gdkdrawable-x11.c gdk/x11/gdkprivate-x11.h

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index be56ec86c7d2610876596f874ffa192ef82c208d..15cf3d1d949a2675704112e60bd9130dad077147 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Fri Jan  4 01:36:48 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkdrawable-x11.c (convert_to_format): Optimize
+       a little bit. (More for consistency than because it
+       makes much of a difference.)
+
 Thu Jan  3 22:18:15 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/gdkdrawable-x11.c gdk/x11/gdkprivate-x11.h

diff --git a/gdk/x11/gdkdrawable-x11.c b/gdk/x11/gdkdrawable-x11.c
index 96f6b05f8ae30def6610383af941ddc490e89115..221e4e0d308d3587748275bdf93f570a1b41f956 100644 (file)
--- a/gdk/x11/gdkdrawable-x11.c
+++ b/gdk/x11/gdkdrawable-x11.c
@@ -1042,20 +1042,18 @@ convert_to_format (guchar        *src_buf,
            guchar *p = (src_buf + i * src_rowstride);
            guchar *q = (dest_buf + i * dest_rowstride);
            guchar *end = p + 4 * width;
-           guchar a;
-           guint t;
+           guint t1,t2,t3;
            
-#define MULT(d,c,a) G_STMT_START { t = c * a; d = ((t >> 8) + t) >> 8; } G_STMT_END
+#define MULT(d,c,a,t) G_STMT_START { t = c * a; d = ((t >> 8) + t) >> 8; } G_STMT_END
            
            if (dest_byteorder == GDK_LSB_FIRST)
              {
                while (p < end)
                  {
-                   a = p[3];
-                   MULT(q[0], p[2], a);
-                   MULT(q[1], p[1], a);
-                   MULT(q[2], p[0], a);
-                   q[3] = a;
+                   MULT(q[0], p[2], p[3], t1);
+                   MULT(q[1], p[1], p[3], t2);
+                   MULT(q[2], p[0], p[3], t3);
+                   q[3] = p[3];
                    p += 4;
                    q += 4;
                  }
@@ -1064,11 +1062,10 @@ convert_to_format (guchar        *src_buf,
              {
                while (p < end)
                  {
-                   a = p[3];
-                   q[0] = a;
-                   MULT(q[1], p[0], a);
-                   MULT(q[2], p[1], a);
-                   MULT(q[3], p[2], a);
+                   q[0] = p[3];
+                   MULT(q[1], p[0], p[3], t1);
+                   MULT(q[2], p[1], p[3], t2);
+                   MULT(q[3], p[2], p[3], t3);
                    p += 4;
                    q += 4;
                  }